tooltips: Remove GtkIconSize usage

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 6112ef0a9758874b2d3b174440d733b725b46af1..81cba1d7186ba06d68d29f6eafc83ee1545e057e 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -296,7 +296,6 @@ gtk_tooltip_set_icon (GtkTooltip *tooltip,
  * gtk_tooltip_set_icon_from_icon_name:
  * @tooltip: a #GtkTooltip
  * @icon_name: (allow-none): an icon name, or %NULL
- * @size: (type int): a stock icon size (#GtkIconSize)
  *
  * Sets the icon of the tooltip (which is in front of the text) to be
  * the icon indicated by @icon_name with the size indicated
@@ -306,21 +305,18 @@ gtk_tooltip_set_icon (GtkTooltip *tooltip,
  */
 void
 gtk_tooltip_set_icon_from_icon_name (GtkTooltip  *tooltip,
-                                    const gchar *icon_name,
-                                    GtkIconSize  size)
+                                    const gchar *icon_name)
 {
   g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
 
   gtk_tooltip_window_set_image_icon_from_name (GTK_TOOLTIP_WINDOW (tooltip->window),
-                                               icon_name,
-                                               size);
+                                               icon_name);
 }
 
 /**
  * gtk_tooltip_set_icon_from_gicon:
  * @tooltip: a #GtkTooltip
  * @gicon: (allow-none): a #GIcon representing the icon, or %NULL
- * @size: (type int): a stock icon size (#GtkIconSize)
  *
  * Sets the icon of the tooltip (which is in front of the text)
  * to be the icon indicated by @gicon with the size indicated
@@ -330,14 +326,12 @@ gtk_tooltip_set_icon_from_icon_name (GtkTooltip  *tooltip,
  */
 void
 gtk_tooltip_set_icon_from_gicon (GtkTooltip  *tooltip,
-                                GIcon       *gicon,
-                                GtkIconSize  size)
+                                GIcon       *gicon)
 {
   g_return_if_fail (GTK_IS_TOOLTIP (tooltip));
 
   gtk_tooltip_window_set_image_icon_from_gicon (GTK_TOOLTIP_WINDOW (tooltip->window),
-                                                gicon,
-                                                size);
+                                                gicon);
 }
 
 /**

diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index 3c4140d7a7551040ec017ef03106e9192e396b0c..c6a129fe600a75cbbe87b05b048982731d4b9fc6 100644 (file)
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -46,12 +46,10 @@ void gtk_tooltip_set_icon                (GtkTooltip         *tooltip,
                                           GdkPixbuf          *pixbuf);
 GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon_from_icon_name (GtkTooltip         *tooltip,
-                                         const gchar        *icon_name,
-                                         GtkIconSize         size);
+                                         const gchar        *icon_name);
 GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_icon_from_gicon     (GtkTooltip         *tooltip,
-                                         GIcon              *gicon,
-                                         GtkIconSize         size);
+                                         GIcon              *gicon);
 GDK_AVAILABLE_IN_ALL
 void gtk_tooltip_set_custom             (GtkTooltip         *tooltip,
                                           GtkWidget          *custom_widget);

diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
index 6aeb31c5201e9c91f8a6ee7add8e84f45ff80037..6a8aa5221fb26c166facbc5c237b793a33617d27 100644 (file)
--- a/gtk/gtktooltipwindow.c
+++ b/gtk/gtktooltipwindow.c
@@ -137,12 +137,11 @@ gtk_tooltip_window_set_image_icon (GtkTooltipWindow *window,
 
 void
 gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window,
-                                             const char       *icon_name,
-                                             GtkIconSize       icon_size)
+                                             const char       *icon_name)
 {
   if (icon_name)
     {
-      gtk_image_set_from_icon_name (GTK_IMAGE (window->image), icon_name, icon_size);
+      gtk_image_set_from_icon_name (GTK_IMAGE (window->image), icon_name, GTK_ICON_SIZE_MENU);
       gtk_widget_show (window->image);
     }
   else
@@ -153,12 +152,11 @@ gtk_tooltip_window_set_image_icon_from_name (GtkTooltipWindow *window,
 
 void
 gtk_tooltip_window_set_image_icon_from_gicon (GtkTooltipWindow *window,
-                                              GIcon            *gicon,
-                                              GtkIconSize       icon_size)
+                                              GIcon            *gicon)
 {
   if (gicon != NULL)
     {
-      gtk_image_set_from_gicon (GTK_IMAGE (window->image), gicon, icon_size);
+      gtk_image_set_from_gicon (GTK_IMAGE (window->image), gicon, GTK_ICON_SIZE_MENU);
       gtk_widget_show (window->image);
     }
   else

diff --git a/gtk/gtktooltipwindowprivate.h b/gtk/gtktooltipwindowprivate.h
index 5389bfd3f50b7c17e4c8d04786e587de6d9f9bd2..35e9f6ee9557fba95ff30df03d121735cf3d6d38 100644 (file)
--- a/gtk/gtktooltipwindowprivate.h
+++ b/gtk/gtktooltipwindowprivate.h
@@ -44,11 +44,9 @@ void            gtk_tooltip_window_set_label_text               (GtkTooltipWindo
 void            gtk_tooltip_window_set_image_icon               (GtkTooltipWindow *window,
                                                                  GdkPixbuf        *pixbuf);
 void            gtk_tooltip_window_set_image_icon_from_name     (GtkTooltipWindow *window,
-                                                                 const char       *icon_name,
-                                                                 GtkIconSize       icon_size);
+                                                                 const char       *icon_name);
 void            gtk_tooltip_window_set_image_icon_from_gicon    (GtkTooltipWindow *window,
-                                                                 GIcon            *gicon,
-                                                                 GtkIconSize       icon_size);
+                                                                 GIcon            *gicon);
 void            gtk_tooltip_window_set_custom_widget            (GtkTooltipWindow *window,
                                                                  GtkWidget        *custom_widget);
 

diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 50345535fca38a4c174d5c4634e330d7951b3908..25485acfbb15d2d5a97931afae7726a6f0a246b0 100644 (file)
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -64,8 +64,7 @@ query_tooltip_cb (GtkWidget  *widget,
                  gpointer    data)
 {
   gtk_tooltip_set_markup (tooltip, gtk_button_get_label (GTK_BUTTON (widget)));
-  gtk_tooltip_set_icon_from_icon_name (tooltip, "edit-delete",
-                                       GTK_ICON_SIZE_MENU);
+  gtk_tooltip_set_icon_from_icon_name (tooltip, "edit-delete");
 
   return TRUE;
 }